welo git mirrors
Commit 236aa4386fdb5fbafd33e9b442cea54c4efe969c
Parents : 4a58be1
Author : welo | main nixos computer <empty@empty.com>
Date : 2026-07-08T08:45:40+01:00
removed all println! statements
Changes
6 files changed, 34 insertions(+), 63 deletions(-)
Diff
diff --git a/src/client.rs b/src/client.rs
index 69de6ad..abde18c 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -51,7 +51,6 @@ pub async fn run_client_forward(server_hex: &str, ports: Vec<ForwardedPort> ) {
if let Some(destination) = decode_hash(server_hex).await {
if let Some((mux, node, rx)) = connect_rns(destination).await {
let reconnect_notify = reconnect_generator(mux.clone(), node, rx, destination).await;
- println!("destinations");
for port in ports {
match port.r#type {
@@ -144,7 +143,7 @@ pub async fn run_sockets_proxy_handling(listen_addr: &str, mux: MuxHandle, recon
};
- println!("started listener {}", listen_addr);
+ info!("started listener {}", listen_addr);
// let buf = &mut [0u8 ;65536];
// Accept SOCKS5 connections
@@ -158,9 +157,6 @@ pub async fn run_sockets_proxy_handling(listen_addr: &str, mux: MuxHandle, recon
continue;
}
};
- println!("{:?}", _addr);
-
- println!("{:?}", mux.is_connected());
if !mux.is_connected() {
warn!("No RNS link, rejecting connection");
@@ -172,8 +168,6 @@ pub async fn run_sockets_proxy_handling(listen_addr: &str, mux: MuxHandle, recon
let session_rx = mux.register_session(sid);
let mux_clone = mux.clone();
- println!("okay");
-
tokio::spawn(async move {
handle_socks5_session(sid, stream, mux_clone, session_rx).await;
});
diff --git a/src/forwarding.rs b/src/forwarding.rs
index 1cb048c..af6e86d 100644
--- a/src/forwarding.rs
+++ b/src/forwarding.rs
@@ -81,7 +81,6 @@ pub async fn tcp_tunnel(mux: MuxHandle, reconnect_notify: Arc<Notify> , port: Fo
let mut session_rx = mux.register_session(sid);
let mux_clone = mux.clone();
- println!("{:?} {:?}", sid, addr);
let target_addr = TargetAddr::Ip(SocketAddr::new(std::net::IpAddr::V4(Ipv4Addr::LOCALHOST), 0)); // ask for any port client server side
tokio::spawn(async move {
diff --git a/src/frame.rs b/src/frame.rs
index 8ceca7e..967d8ba 100644
--- a/src/frame.rs
+++ b/src/frame.rs
@@ -100,7 +100,6 @@ impl Frame {
let session_id = u32::from_be_bytes([buf[1], buf[2], buf[3], buf[4]]);
let payload_len = u16::from_be_bytes([buf[5], buf[6]]) as usize;
let total = HDR_SIZE + payload_len;
- println!("{:?} {:?} {:?} {:?} {:?}", frame_type, session_id, payload_len, total, buf.len());
if buf.len() < total {
return None;
}
diff --git a/src/mux.rs b/src/mux.rs
index 826fff2..95ebd59 100644
--- a/src/mux.rs
+++ b/src/mux.rs
@@ -157,7 +157,6 @@ impl MuxHandle {
loop {
match Frame::decode(&buf) {
Some((frame, consumed)) => {
- println!("yea {:?} {:?}", frame, consumed);
buf.drain(..consumed);
frames.push(frame);
}
diff --git a/src/relay.rs b/src/relay.rs
index 288600d..52c4bd0 100644
--- a/src/relay.rs
+++ b/src/relay.rs
@@ -50,10 +50,8 @@ pub async fn relay_bidirectional_tcp(
// RNS -> TCP
let rns_to_tcp = tokio::spawn(async move {
while let Some(frame) = session_rx.recv().await {
- println!("{:?}", frame.frame_type);
match frame.frame_type {
FrameType::Data => {
- println!("{:?}", &frame.payload);
if let Err(e) = tcp_write.write_all(&frame.payload).await {
warn!("[{}] TCP write error: {}", sid, e);
break;
@@ -115,13 +113,12 @@ pub async fn relay_bidirectional_udp_client_side(
let mut buf = [0u8; 4096];
loop {
let stuff = socket.recv_from(&mut buf).await;
- println!("certified stuff {:?}", stuff);
+
match stuff {
- Ok((0,_)) => {println!("end for some reason"); break},
+ Ok((0,_)) => { break},
Ok((n,addr)) => {
- println!("sending udp to rns data {:?} {:?}", &buf[..n], addr);
- println!("sending udp to rns data {:?}", String::from_utf8_lossy(&buf[..n]));
- println!("sid: {:?} ", sid);
+
+
let mut a = client_local_port_1.lock().await; *a = Some(addr.port());
mux_fwd.send(FrameType::Data, sid, buf[..n].to_vec());
@@ -138,21 +135,20 @@ pub async fn relay_bidirectional_udp_client_side(
let rns_to_udp = tokio::spawn(async move {
loop {
if let Some(frame) = session_rx.recv().await {
- println!("killed");
- println!("{:?}", frame);
+
+
match frame.frame_type {
FrameType::Data => {
let a = client_local_port_2.lock().await;
let value = *a;
if let Some(port) = value {
- println!("port: {:?}", port);
+
if let Err(e) = socket1.send_to(&frame.payload, (Ipv4Addr::LOCALHOST,port)).await {
warn!("[{}] UDP write error: {}", sid, e);
break;
} else {
- println!("sent packet")
- };
+ };
} else {
warn!("UDP received but client side does not know of a port");
@@ -161,17 +157,17 @@ pub async fn relay_bidirectional_udp_client_side(
// could do anything, so we just leave it open.
}
}
- FrameType::Close => {println!("frame closed {:?}", frame); break},
+ FrameType::Close => { break},
_ => {}
}
} else {
- println!("ended socket stream?");
+
break;
};
}
- println!("ended");
+
});
let (mut tcp_read, mut _tcp_write) = tcp_stream.into_split();
@@ -194,9 +190,9 @@ pub async fn relay_bidirectional_udp_client_side(
}
});
tokio::select! {
- _ = udp_to_rns => {println!("udp end")},
- _ = rns_to_udp => {println!("rns end")},
- _ = break_connection_tcp_check => {println!("tcp end")},
+ _ = udp_to_rns => {},
+ _ = rns_to_udp => {},
+ _ = break_connection_tcp_check => {}
}
mux.send(FrameType::Close, sid, Vec::new());
@@ -223,20 +219,14 @@ pub async fn relay_bidirectional_udp_server_side(
let mut buf = [0u8; 4096];
loop {
let stuff = socket.recv_from(&mut buf).await;
- println!("certified stuff {:?}", stuff);
+
match stuff {
- Ok((0,_)) => {println!("end for some reason"); break},
+ Ok((0,_)) => { break},
Ok((n,addr)) => {
- println!("sending udp to rns data {:?} {:?}", &buf[..n], addr);
- println!("sending udp to rns data {:?}", String::from_utf8_lossy(&buf[..n]));
- println!("sid: {:?} ", sid);
-
- // okay i cant be boethered add filter config thing here
if allowed_ip(addr, &config1).await {
-
let mut packet = new_udp_header(addr).expect("cannot wrap udp packet");
packet.extend_from_slice(&buf[..n]);
- println!("sending with stuff {:?}", packet);
+
mux_fwd.send(FrameType::Data, sid, packet.to_vec());
} else {
warn!("packet came from illegal server location")
@@ -254,15 +244,13 @@ pub async fn relay_bidirectional_udp_server_side(
let rns_to_udp = tokio::spawn(async move {
loop {
if let Some(frame) = session_rx.recv().await {
- println!("killed");
- println!("{:?}", frame);
+
+
match frame.frame_type {
FrameType::Data => {
match parse_udp_request(&*frame.payload).await {
Ok((frag,addr,data)) => {
- println!("sending rns to udp data {:?}:{:?}:{:?}", frag, addr, data);
- println!("sending rns to udp data {:?}", String::from_utf8_lossy(data));
- println!("sending from: {:?} to {:?}", socket1.local_addr(), addr);
+
if let Some(socket) = filter_and_convert(addr.clone(), Some(&config2)).await {
@@ -270,8 +258,7 @@ pub async fn relay_bidirectional_udp_server_side(
warn!("[{}] UDP write error: {}", sid, e);
break;
} else {
- println!("sent packet")
- }
+ }
} else {
warn!("[{}] client attempted to send to illegal location {}",sid, addr)
}
@@ -286,23 +273,23 @@ pub async fn relay_bidirectional_udp_server_side(
};
}
- FrameType::Close => {println!("frame closed {:?}", frame); break},
+ FrameType::Close => { break},
_ => {}
}
} else {
- println!("ended socket stream?");
+
break;
};
}
- println!("ended");
+
});
tokio::select! {
- _ = udp_to_rns => {println!("udp end")},
- _ = rns_to_udp => {println!("rns end")},
+ _ = udp_to_rns => {},
+ _ = rns_to_udp => {},
}
mux.send(FrameType::Close, sid, Vec::new());
@@ -338,7 +325,7 @@ pub async fn relay_forwarded_tcp(
match tcp_read.read(&mut buf).await {
Ok(0) => break,
Ok(n) => {
- println!("{:?} {:?}", sid, &buf[..n]);
+
mux_fwd.send(FrameType::Data, sid, buf[..n].to_vec());
}
Err(e) => {
@@ -355,7 +342,7 @@ pub async fn relay_forwarded_tcp(
while let Some(frame) = session_rx.recv().await {
match frame.frame_type {
FrameType::Data => {
- println!("{:?}", &frame.payload);
+
if let Err(e) = tcp_write.write_all(&frame.payload).await {
warn!("[{}] TCP write error: {}", sid, e);
break;
@@ -397,10 +384,10 @@ pub async fn relay_forwarded_udp(
match udp_read.read(&mut buf).await {
Ok(0) => break,
Ok(n) => {
- println!("{:?} {:?}", sid, &buf[..n]);
+
let mut packet = new_udp_header(localhost_server_addr.clone() ).expect("cannot wrap udp packet");
packet.extend_from_slice(&buf[..n]);
- println!("sending with stuff {:?}", packet);
+
mux_fwd.send(FrameType::Data, sid, packet.to_vec());
}
Err(e) => {
@@ -417,22 +404,16 @@ pub async fn relay_forwarded_udp(
while let Some(frame) = session_rx.recv().await {
match frame.frame_type {
FrameType::Data => {
- println!("{:?}", &frame.payload);
+
match parse_udp_request(&*frame.payload).await {
Ok((frag,addr,data)) => {
- println!("sending rns to udp data {:?}:{:?}:{:?}", frag, addr, data);
- println!("sending rns to udp data {:?}", String::from_utf8_lossy(data));
-
- let target = addr.into_string_and_port(); // string conversion is the only way to convert
- println!("{:?}", target);
- // between the tokio and fastsocksv5 versions for some reason
+ let target = addr.into_string_and_port();
if let Err(e) = udp_write.write_all(data).await {
warn!("[{}] UDP write error: {}", sid, e);
break;
} else {
- println!("sent packet")
- }
+ }
}
Err(e) => {
debug!("[{}] UDP read error: {}", sid, e);
diff --git a/src/server.rs b/src/server.rs
index a5f5b8f..4652071 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -194,7 +194,6 @@ pub async fn run_server(identity_path: Option<&str>, filter_config: FilterConfig
}
}
FrameType::Data | FrameType::Close => {
- println!("frame: {:?}",frame);
mux.dispatch(frame);
}
_ => {}
Served by rngit 1.4.2 - Generated in 0.03s